[XEND] Do not delete VNC password from configuration.

Fixes reboot of HVM guest when VNC authentication is in use.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 8a761d89cf0ddddd50e2a0cd851980cb9fc16cd2..95099e765536565896fe5e906590c2957c519a9e 100644 (file)
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -361,9 +361,6 @@ class HVMImageHandler(ImageHandler):
 
         if nographic:
             ret.append('-nographic')
-            # remove password
-            if vncpasswd_vmconfig:
-                config.remove(['vncpasswd', vncpasswd_vmconfig])
             return ret
 
         if vnc:
@@ -395,9 +392,6 @@ class HVMImageHandler(ImageHandler):
             if vncpasswd != '':
                 self.vm.storeVm("vncpasswd", vncpasswd)
 
-        # remove password
-        config.remove(['vncpasswd', vncpasswd_vmconfig])
-
         return ret
 
     def createDeviceModel(self):